Merge "[automerger skipped] Merge "DO NOT MERGE: Edit test case for non-handheld device." into oreo-cts-dev am: c0be45569d  -s ours" into oreo-mr1-cts-dev
am: cdbbc8ac40  -s ours

Change-Id: I595d0635d941b816d879feac0ce2cd57fa05e446