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

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

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