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
am: 4679b555  -s ours

Change-Id: I54b9244a2cafba1c14290473e8b73fe52a2403c1