[automerger skipped] Merge "Fix test failures(bug 268231685) on TV targets"...

[automerger skipped] Merge "Fix test failures(bug 268231685) on TV targets" into udc-dev am: 6bbbc4bb am: 269567c6 -s ours

am skip reason: Merged-In Ib8cc36f65386591740c571bba8d6edd41d2373f2 with SHA-1 552a7190 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22609285



Change-Id: I984557292161d842ca9ab6a880e600bb4a88fa15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>