Merge "VSDK fake snapshot may read hwasan modules" am: b1fbcaf684 am: 3c0614c2db

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

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