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

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

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