[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 sc-dev am: 640a584e -s ours

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

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



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