Merge "Fix type issues of TvMessage" into udc-dev am: 6b3ebf82 am: 6c0d2b24

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



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