[automerger skipped] Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests"
am: 562a82f521
-s ours
Change-Id: I38c8b726fc1aa7551af2329c6d1355a42f4744a6
This commit is contained in:
am: 562a82f521
-s ours
Change-Id: I38c8b726fc1aa7551af2329c6d1355a42f4744a6