[automerger skipped] Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." am: cd2bdd1e am: 34d1c0a1 am: d2839e58 -s ours am: ce8a08df -s ours am: 379611af -s ours

am skip reason: Merged-In I6df0579cd33e2b2efcd8477270160b46c10d0a3a with SHA-1 9bea0150 is already in history

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



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