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 am: ade2f383

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



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