Merge "Adding force_flash functionality" into main am: eb216507 am:...

Merge "Adding force_flash functionality" into main am: eb216507 am: c5e5e488 am: 27e7f6d6 am: a8d94260 am: 99f360ce

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



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