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

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e6 am: 1a06ebfc am: 781d8f74 am: c8ac64ac am: b7f27905
am: d05a06d1  -s ours

Change-Id: I0931d2e1abf4a28949ceec6c0d0838b4a94f488b