Android n mr1 preview 2
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show"