[automerger skipped] Merge "Cherry pick UidFrozenStateChanged API signature" am: 4e225633 am: 99490f7d am: 9300834f -s ours am: 87e48ba3 -s ours

am skip reason: Merged-In I27ae40f345532836bdcb0e0dc3d7d7315c110d29 with SHA-1 a0104a05 is already in history

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



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