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

[automerger skipped] Merge changes from topics "GET_USER_HANDLE_FLAG", "subscription_apis" am: 0a842957 am: 8430fab4 am: bef33d1e -s ours

am skip reason: Merged-In I542be7f798b16227614f0467259015f856720d14 with SHA-1 db24010d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2499975



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