Merge "Merge "store preferential configs if no error from CS" am: f315172a...

Merge "Merge "store preferential configs if no error from CS" am: f315172a am: d154af9b am: 66c5ab1f am: 1f0220ef" into udc-d1-dev-plus-aosp am: cb33a667

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



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