Merge "Fix "Factory Reset" fails to reset the device" into tm-dev am: f797153708
am: 43e8f350d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397 Change-Id: Ia9c902f810f0d653fcdf57fbc6979fc8d4bb1b27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: