Merge "Add bp subtitle for TYPE_CREDENTIAL" into udc-qpr-dev am: e6b31d1c am: 4ec927e3

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



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