[automerger skipped] Merge "Make PCC indication logic consistent between HIDL...

[automerger skipped] Merge "Make PCC indication logic consistent between HIDL and AIDL" am: 2e57ed94 am: 5cea5563 -s ours am: 752645e5 -s ours am: da218efc -s ours

am skip reason: Merged-In I006ac22631bca42566d2980a981a5a813c1055f0 with SHA-1 bc20a958 is already in history

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



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