Merge "am:fix the dead lock." into main am: 6d444f1a0a am: 30b5279e89

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

Change-Id: Ic0d97cafdfa624ba0dc9ee637805646110e75d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>