Merge "Merge "Merge "[automerger skipped] Merge "Revert "DO NOT MERGE test if b/65484460 is fixed."" into oreo-cts-dev am: 5b021a18ce  -s ours" into oreo-mr1-cts-dev am: 6fdb58a2af  -s ours" into pie-cts-dev am: c5d976a2b5  -s ours" am: 5cc0ef800f  -s ours am: ec2279c35c  -s ours
am: 617609bed3  -s ours

Change-Id: I6d170d1fad54d729e9619861326a941781c71720