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

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



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