[conflict] Merge "Fix settings activity showing background bp when...

[conflict] 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



Bug: 388628639
Change-Id: I41397c509f9f3eaf408676147d9a962bc6e477ee
Merged-In: I722e285cd15869799b9fadd2324014cf3c6d44ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>