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

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



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