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

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

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