[automerger skipped] Merge "store preferential configs if no error from CS"...

[automerger skipped] Merge "store preferential configs if no error from CS" into udc-qpr-dev am: 29cf40a9 -s ours am: d23c61e4 -s ours

am skip reason: Merged-In I8421e4d21b8719426cfb998d96742e065641efcd with SHA-1 38b01ce5 is already in history

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



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