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: c9984ec4 am: c261e6b4

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



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