[automerger skipped] [automerger] DO NOT MERGE Add null check to EmergencyCallbackModeExitDialog activity. am: 78fab1f98d am: 06c169f3db am: 04676b86b4 skipped: c20ea0938b am: a91ef0b14b am: 47ff9a1f65 am: d3ce7249ce am: 6893327c60 skipped: f45b5b3cb4 am: 1900f810b9 am: c1a1335938
am: e57367a775  -s ours

Change-Id: Iecdb487ead57f364ed08f3fb071343a61bdd25d7