Merge "Pointed FlashingPlan to Interface" am: 7d67d569f3 am: ad1e0faffa am: 27072bba38

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

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