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

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



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