Merge "Add messages count to all layouts" into sc-dev am: 0c1e189278

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

Change-Id: I1d3403c4893debb5c560f1dad9c522146b67fcc1