[automerger skipped] Merge changes from topic "USER_HANDLE_API" am: df088874...

[automerger skipped] Merge changes from topic "USER_HANDLE_API" am: df088874 am: 68318608 am: dd360a26 -s ours am: e3968302 -s ours

am skip reason: Merged-In I7fa09707595877f3edd6619ed875020e4e39f263 with SHA-1 43d6c2de is already in history

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



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