Merge "Make PCC indication logic consistent between HIDL and AIDL"