[automerger skipped] Merge "DO NOT MERGE test if b/65484460 is fixed." into oreo-cts-dev
am: a856ef1a86  -s ours

Change-Id: I65d766d173e3d5e528cc04070fd4263407361396