Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426
am: c8ac64aca7

Change-Id: I8116a4a96c47bad2ff769fba878b863cc517c016