[automerger skipped] Merge "Add AIDL methods to override carrier package" into udc-dev am: e17bb328f6 am: c3e46191c4 -s ours
am skip reason: Merged-In I9c31e19dd122123e8e102c901efaa99b2c729635 with SHA-1 20c43bc2ef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21803561
Change-Id: I037aa9f8d9762f76c72f6b89892a80e83ff2bb24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: