Merge "Update bp subtitle base on modality" into udc-qpr-dev am: ab6d03f64b am: 3946e31d3d

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

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