Merge "Make PCC indication logic consistent between HIDL and AIDL" into tm-dev...

Merge "Make PCC indication logic consistent between HIDL and AIDL" into tm-dev am: f6525d58 am: b140ca7a am: 2e8ded56

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



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