[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 1dc8998458 am: b35f19c7bf -s ours
am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 094e13af5d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293
Change-Id: Ib95f75820ff5950fd30e07ce11c4d3605dcffb27
This commit is contained in: