Merge "Handle empty action entry subtitle" into udc-dev am: 5756c965 am: b27ee5bc am: 12f97598

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



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