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

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



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