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

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

Change-Id: I52688f826a5d532a4932853e36f0b26471a372c4