[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-qpr-dev am: c8aa782b -s ours am: 57effcac -s ours am: d96b6d42 -s ours

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

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



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