[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-dev am: 89600e2289 -s ours am: c7f10afcae -s ours am: 07715f906a -s ours

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

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

Change-Id: Ie5881fe3883031469afef3b5194ea3d3da4ec682
This commit is contained in:
Chris Tate
2020-06-03 22:36:13 +00:00
committed by Automerger Merge Worker

Diff Content Not Available