Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
am: 49b144e630

Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f