Merge "Use CS identity to update setting while performing factory reset" am: 049dbc5697 am: ab42076b53 am: 6eeaa90005

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

Change-Id: I97ea36e551d4445475e8edce1a752d380fd03bee