Merge "hikey: update the size for the partition of system and userdata" into main am: 9a5f48ee55 am: 53fac62fee am: 06943e2252

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2583198

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