Merge "Fix incorrect evaluation of TvMessage count" into udc-dev am:...

Merge "Fix incorrect evaluation of TvMessage count" into udc-dev am: 4fca5c41 am: b1e0022d am: d2b7b8e0

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



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