Merge "hikey960: Switch system->super partition on hisi ptable as well." am: 8811fd3ab2 am: ce3370c0dd am: 1214dffe7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6878f4e434ba981d2d9386405c1182f8ed454fa