Merge "Expose imageLocationsOnDevice as well as imageLocationsOnHost" am: c1218f395c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744553

Change-Id: I97744f93f9becea296affa1d2a29a2146075ec8b