[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34bbe am: 3ef103ff9e -s ours am: 8dc1970154 -s ours

am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 fac2a72593 is already in history

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

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