Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am:...

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d am: 45918b72 am: e1858cab am: 975e782d

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



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