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

Merge "Merge "Fix type issues of TvMessage" into udc-dev am: 6b3ebf82 am: 6c0d2b24 am: 7d7180e4" into udc-qpr-dev-plus-aosp am: dfd77df4

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



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