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

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



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