[automerger skipped] Merge "Add DSU default userdata partition size" into rvc-dev am: 56d9d677e8 -s ours am: ad98a0c897 -s ours
am skip reason: Change-Id I52767dfefef394403c5e16fcfd40792b14ff9a71 with SHA-1 f41e145480 is in history
Change-Id: I1cc6f788099f4361b0a533355cb969a8a85a2712
This commit is contained in: