Merge "Wipe /data with ext4 before 16K OTA" into main am: 2e090585ca am: ae28bee6fc

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

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