Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe

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

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