Merge "Add new carrier config to record the default preference setting" into tm-qpr-dev am: 7e909b6014

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

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