[automerger skipped] Merge "Defer UID data removal until after reading is finished" am: ce2d40870e am: 7fddb382f7 am: 155808b3e2 -s ours am: 052c8cae69 -s ours
am skip reason: Change-Id I38e037b89e71b0cb1ba01374189ba8b7af01d632 with SHA-1 9451197708 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554529
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic472e024b2454f0dd33b875d996ccb87ff562edc
This commit is contained in: