[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: 4ab0c4d0 -s ours

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

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

Change-Id: I70528e1c9b9d531f20eacbb9ac467c673da1ec37