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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff6dfbeda11d1ae6fd6cd9a28cd622f2cec7045