[automerger skipped] Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." am: cd2bdd1e84 am: 34d1c0a1d9 am: d2839e58e4 -s ours
am skip reason: Merged-In I6df0579cd33e2b2efcd8477270160b46c10d0a3a with SHA-1 9bea015021 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2468184
Change-Id: I0c5a367d91e4bd99bfde7dd920ed983fb7d6b71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: