[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: 1dc89984 -s ours am: 43e59b89 -s ours

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

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

Change-Id: I4c1088a626cb0c8d0dd17ddbac6ff47ffee20b1c