[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: b2ff727f -s ours am: 02bd34ec -s ours am: c9bac9e1 -s ours am: 13844b30 -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: I367e619d8c5aeb2ee502450ed63820cce0523a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>