Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours
am: 0a568ae56e
Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb
This commit is contained in: