Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am: 6f3a05ae77 -s ours
am: 20307881d7 -s ours
Change-Id: I14e0635d7ed1d7caf14f9217d5d0bf88685a738f
This commit is contained in: