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

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



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