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

Change-Id: Ib1a4c7247c03a3a3b2d51fe2faa357248d8c11f2