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

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

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