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