Merge "Fix potential NPE in EmergencyCallbackModeExitDialog." into oc-dev
am: 629232b794

Change-Id: Iea4b84e590c2f251b2de3a64eba59e41d638c874