Merge "Consider entity length when deciding whether to show actions" into tm-qpr-dev am: 5ecceeef

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



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