[automerger skipped] Merge "Add DSU default userdata partition size" into rvc-dev am: 56d9d677 am: a150bf3f -s ours
am skip reason: Change-Id I52767dfefef394403c5e16fcfd40792b14ff9a71 with SHA-1 f41e1454 is in history
Change-Id: Iba53323c5878ead78b110e9701941600ee9b45e7