Merge "Fix settings activity showing background bp when...

Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: c2ac83fd

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



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