[automerger skipped] Merge "Add new carrier config to record the default preference setting" into tm-qpr-dev am: 7e909b6014 am: 1d010fba21 -s ours
am skip reason: Merged-In Idaa9cfb1739f8261e9a4697eae30b7f4e16241c7 with SHA-1 9e19af0d91 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20408183
Change-Id: Ia1f65b8a58a2ce1754beb0242c7abb3b40b8b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: