Merge "Pointed FlashingPlan to Interface" am: 7d67d569 am: ad1e0faf am:...

Merge "Pointed FlashingPlan to Interface" am: 7d67d569 am: ad1e0faf am: 27072bba am: 8fc3faec

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2530984



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