Merge "Separate the demo user factory reset option with admin user factory...

Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb am: 0d3ae3ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431



Change-Id: Ie89643b620ee82e4f30ab98ca466f54bd68b8067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>