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

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

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