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

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fc  -s ours am: 16090c61  -s ours am: 0a568ae5 am: 9788dd5b am: 6ec8dd10
am: 921dd6a5  -s ours

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057