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

[automerger skipped] Merge "Make PCC indication logic consistent between HIDL and AIDL" am: e07281f0 am: c0297221 -s ours am: 6e72bb1a -s ours am: 1eba74e7 -s ours

am skip reason: Merged-In Ib1045aafe5e59cb1a6545612d87514929e60b6a6 with SHA-1 71af19fe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094530



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