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

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

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

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

Change-Id: Iab66f2e2967988c991c83eec03d410006dca6581