Merge "remount: Create a bigger scratch partition on /data." am: c2b2bf3539

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1989238

Change-Id: Iddb064bfcfa9614be0ec3584eccab3e66b49ee9d