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

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

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