[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: a4e79c7d -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: Ic067f031445a44c4b7f337ff545e11f2e2d82521