[automerger skipped] Merge "Introduce APIs to retrieve only carrier configs as...

[automerger skipped] Merge "Introduce APIs to retrieve only carrier configs as needed" am: 9452519e am: c5065578 am: edb03d31 -s ours am: 1edbb3a0 -s ours

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

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



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