tree fd2828230985b882f35a88909e70cd6b0ab7c546
parent e3232dac25445d03be2aa26a0c0aa679c0ae2a3d
parent 0d3ae3ed32472832ad496adbc6a22d1b47882d17
author Wentao Wang <wwtbuaa@google.com> 1694613204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694613204 +0000

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

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>