Merge "Don't infer the default boot image location in otapreopt." am:...

Merge "Don't infer the default boot image location in otapreopt." am: d212ab59 am: 6e65f959 am: 878e3bdd am: 2f894ca5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2482095



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