[automerger skipped] Merge "DO NOT MERGE Avoid test failed for tablet device" into pie-cts-dev am: 075244741c -s ours
am: 7905e2482d -s ours
am skip reason: subject contains skip directive

Change-Id: I5d25bb2c38c23fea448a9bc678b5a9fa09eff398