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

Merge "Merge "Fix type issues of TvMessage" into udc-dev am: 6b3ebf82" into udc-dev-plus-aosp am: 8efa4439

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



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