[automerger skipped] Merge changes from topic "aidl-java-api-ci" am:...

[automerger skipped] Merge changes from topic "aidl-java-api-ci" am: f03e4995 am: d53c4bac -s ours am: 0f26ad9d -s ours

am skip reason: Merged-In I6eaf60bfa5b852937d497697a769aab3eee2e2fd with SHA-1 77a7db9e is already in history

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



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