[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-v2-dev am: 40d8b4cf -s ours am: 475a4237 -s ours am: 1e9c5024 -s ours am: a3b5bd3b -s ours

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

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



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