Merge "Fix test failures(bug 268231685) on TV targets" into udc-dev am: 6bbbc4bb

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



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