Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380

Original change: https://android-review.googlesource.com/c/platform/build/+/2654583



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