Merge "Fix "Factory Reset" fails to reset the device" into tm-dev am: f7971537

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



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