[automerger skipped] Merge changes from topics "GET_USER_HANDLE_FLAG",...

[automerger skipped] Merge changes from topics "GET_USER_HANDLE_FLAG", "subscription_apis" am: d118f3ef am: 66accd72 am: b8fed07c -s ours am: 089cca8c -s ours am: db72e612 -s ours

am skip reason: Merged-In I9396f8e329ecec815d7a4aecba0d10c1a2a9c8c7 with SHA-1 34730f65 is already in history

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



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