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

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

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