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

Change-Id: Ia45feea279ef24afe3450108fc63343461abf7ea