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
am: 3b4f8bc0

Change-Id: Ie39a05ce72f9d65ae6c5a76a6954a27966b7f667