Merge "Consider entity length when deciding whether to show actions" into...

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

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



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