This reverts commit 05dd1ba540. Reason for revert: Skips more tests than it should in AOSP Bug: 192302892 Change-Id: I7c5638d8c1cc626354d240a06af758e1cdd92e94
05dd1ba540