[automerger skipped] Merge "Add AIDL methods to override carrier package" into...

[automerger skipped] Merge "Add AIDL methods to override carrier package" into main am: 6f74b260 am: 0e64ba22 -s ours am: 8de73db5 -s ours

am skip reason: Merged-In I9c31e19dd122123e8e102c901efaa99b2c729635 with SHA-1 20c43bc2 is already in history

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



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