Merge "[automerger skipped] Merge "More fixes towards the race conditions in...

Merge "[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-qpr1-dev am: 480dc8cd -s ours am: 86dcec42 -s ours am: a4e79c7d -s ours" into rvc-d1-dev-plus-aosp am: a7325f96 -s ours

am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069d is in history

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

Change-Id: Ib5ea12eac6e44c7829f5a3b63219fc3f5d564cb6