[automerger skipped] Merge "Mitigate the races during installation" into...

[automerger skipped] Merge "Mitigate the races during installation" into tm-dev am: b4fd1c7a am: 23f61105 -s ours

am skip reason: Merged-In Ia6b32f72f3d75b8a40c42e11d21f21c459db5299 with SHA-1 65067cb3 is already in history

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

Change-Id: Icadccf20b87a76fdb2d51bcdbfffc446355d1b5c