Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into...

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee290368  -s ours am: 6166af96 am: 63c9a312 am: 84a96149  -s ours am: d167a27c am: 892385f5
am: 4c1922b4

Change-Id: Ia972df65c6ad3da624c16cbe911474560286ac3d