Merge "Make PCC indication logic consistent between HIDL and AIDL" into tm-dev am: 093e5392 am: 487aad24 am: 0c72a13d

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



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