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

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948 am: 34de2a2d  -s ours am: a5c82e7d am: ca2abc5b am: ae5db8a6 am: db984f91  -s ours am: ee6b51a0 am: 20def2e7 am: 6e8fef24
am: eb4de170

Change-Id: I1a405d53ae83b3e227f258d8aded7c9e1c0d6e88