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

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11