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: b61995b5 -s ours am: 1b5da48f -s ours" into rvc-qpr-dev-plus-aosp am: d6bd49d9 -s ours

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

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

Change-Id: I83b597086cb01655d6dd4e2e5fce9bddeb88f2ed