Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb
am: 34de2a2d45  -s ours

Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d