[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-qpr1-dev am: 6f2bb120 -s ours am: 9483dde5 -s ours am: 4c324b79 -s ours am: 29917925 -s ours

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

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



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