Merge "Prebuilt replacing source should not change partition" am: 7ef8d466...

Merge "Prebuilt replacing source should not change partition" am: 7ef8d466 am: 34d8436f am: 94b22593 am: 1b361b69

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



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