Temporary workarounds to make tests pass on a virtual device

Bug: 136278866
Change-Id: I198cb4cdf94c2b1151b4b7249ae10dbcaa99a4fd
4 files changed