tree fc9b3d8396d88455564195c230c8a0168ba6ec8e
parent 06085e6ab386065ba1fd6efc36827cef0bddd12f
parent 4d832266632e22a8c5c006cd9616201011ff9729
author Makoto Onuki <omakoto@google.com> 1615254156 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615254156 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20ebeab1147f78b7ed2d481f00fd3d8cbb9a7879