Merge "Adding testing for optimized flash super" into main am: 7d8ac7f1 am:...

Merge "Adding testing for optimized flash super" into main am: 7d8ac7f1 am: 3d232758 am: aa1d8c39

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



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