tree 923833fb1427252ed7547dd72bd8f66c8d23d430
parent defdff1e77696390700f312146295e986282c321
parent dc0145c189063140a72e2e48539660811008cfd3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584384626 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584384626 +0000

[automerger skipped] Merge "DO NOT MERGE Fix failed test case when test on TV" into pie-cts-dev am: e4b349cf4f -s ours am: dc0145c189 -s ours

am skip reason: subject contains skip directive

Change-Id: I953471ef73873369c916e2cae5f8b321b5911ac7