Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4 am: 2a581813c8 am: f0651f3179 am: 4d47a18e01

Original change: https://android-review.googlesource.com/c/platform/development/+/2045663

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