[automerger skipped] Merge "Handle uid state changes on the handler thread." into main am: e1925a86ec am: a6ed0bd39c -s ours am: 6db6ccb01e -s ours

am skip reason: Merged-In I005ee6a7486ec1cc6dfe0c7ad4b488309dbda270 with SHA-1 c41bfb089c is already in history

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

Change-Id: I10b0075dedb7923a3d47fa4932e6695edaefafb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>