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

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

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