[automerger skipped] Merge changes from topics "GET_USER_HANDLE_FLAG", "subscription_apis" am: d118f3efbb am: 66accd72eb am: b8fed07ca2 -s ours
am skip reason: Merged-In I9396f8e329ecec815d7a4aecba0d10c1a2a9c8c7 with SHA-1 34730f654d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2500015
Change-Id: I8ed827c8c07424862ccf9cfd34dd08e7b071dcaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: