[automerger skipped] Merge "Introduce APIs to retrieve only carrier configs as needed" am: 9452519e24 am: c506557875 am: edb03d3120 -s ours

am skip reason: Merged-In I436b9ad1d7e928d628c0103144cd345e8c4c4e3c with SHA-1 365825e2c5 is already in history

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

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