[automerger skipped] Merge "Defer UID data removal until after reading is...

[automerger skipped] Merge "Defer UID data removal until after reading is finished" am: ce2d4087 am: 7fddb382 am: 155808b3 -s ours

am skip reason: Change-Id I38e037b89e71b0cb1ba01374189ba8b7af01d632 with SHA-1 94511977 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b70d917bfaaaead46ed3919484b436ab626f877