[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 tm-dev am: 6b22d7cf am: 4d3b791f -s ours am: 29f2952e -s ours

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

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



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