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

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9  -s ours am: b9634f30 am: 9dccfbc7
am: 68d354ab

Change-Id: I1c8d54f67f0e644e90856197a0713f7d6f86b33f