Merge "Merge "[automerger skipped] Merge "Revert "DO NOT MERGE test if b/65484460 is fixed."" into oreo-cts-dev am: 5b021a18ce  -s ours am: 74695c1f76 am: ab309501b9" into oc-mr1-dev am: 3cd786045c  -s ours am: b48a9ab57b" into pi-dev-plus-aosp