Merge "Handle empty action entry subtitle" into udc-dev am: 5756c965 am:...

Merge "Handle empty action entry subtitle" into udc-dev am: 5756c965 am: 070ab755 am: 378bdfe7

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



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