Merge "[Bugfix] Fix after performing adb shell am hang and kill this process, the phone can not resume from hang state"
