Merge "Added support for FlashSuperLayoutTask" am: 769ea81c4c

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

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