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

Change-Id: I66e4b9c14fa0ea67cc6744fbd3837e3bd78b1ddb