Merge "Update bp subtitle base on modality" into udc-d1-dev am: 5e84bc9a am: 7136f5f2 am: 88e5910a

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



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