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

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

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



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