[automerger skipped] Merge "Add AIDL methods to override carrier package" into main am: 6f74b260aa am: 0e64ba2230 -s ours am: 8de73db550 -s ours am: 1e2968226e -s ours am: e9538941dc -s ours

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

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

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