[automerger skipped] Merge changes from topic "get_all_subs" am: aa0bee6f...

[automerger skipped] Merge changes from topic "get_all_subs" am: aa0bee6f am: b472bc5f am: 458a4c10 -s ours am: eae0b64c -s ours

am skip reason: Merged-In I784c5aaa8fcfc84d3f6abac451fd52105893198a with SHA-1 c6474408 is already in history

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



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