Merge "Reserve space in super for dynamic partition metadata" am: 115a70409f am: 42ae98c3bf

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1645947

Change-Id: I5ea90af5e0cc1d9c9f4d79c63985098f5e678c2e