[automerger skipped] Merge "Use CS identity to update setting while performing...

[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34b am: 3ef103ff -s ours am: 8dc19701 -s ours

am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 fac2a725 is already in history

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

Change-Id: Ia4d8ed31a0ad201026d6a85a591fce49b9716a25