Merge "Use CS identity to update setting while performing factory reset" am: 84e3b0d051

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

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