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

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



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