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

[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-dev am: 89600e22 -s ours am: c7f10afc -s ours am: 07715f90 -s ours am: 3cf16a7f -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/+/11604125

Change-Id: I93248daca848330f743483747b7aad3008f51386