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

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



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