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

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

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



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