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

[automerger skipped] Merge "More fixes towards the race conditions in AMS" into pi-dev am: f56666c5 -s ours am: 0295276d -s ours am: f400177a -s ours am: ae88624e -s ours am: 8b5477f9 -s ours am: f1d8e83e -s ours

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

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

Change-Id: Idb4e60e10b3f6bc84dab41e74b63aeb50bc78f69