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

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

Change-Id: I7c23d33349e7f28a6fc17f5191e973f60e1eb96d
tree: fffe58daa3faccbcf5060cda44f537569b259fcf
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING