Merge "[automerger skipped] Merge "Add DSU default userdata partition size"...

Merge "[automerger skipped] Merge "Add DSU default userdata partition size" into rvc-dev am: 56d9d677 -s ours am: ad98a0c8 -s ours am skip reason: Change-Id I52767dfefef394403c5e16fcfd40792b14ff9a71 with SHA-1 f41e1454 is in history" into rvc-d1-dev-plus-aosp am: 6fcff10a -s ours
am skip reason: Change-Id I52767dfefef394403c5e16fcfd40792b14ff9a71 with SHA-1 9834448c is in history

Change-Id: I3272f651bdd5a8e6ebaa835bf4ae5454765501fe