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

[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into udc-qpr-dev am: aa2c3c0c -s ours

am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 58d536c5 is already in history

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



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