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 am: 05a61276
am: 23270f13

Change-Id: I242883361ff06daefe80686314e8869a3b6733f4