[automerger skipped] [conflict] Merge "Fix settings activity showing...

[automerger skipped] [conflict] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: c2ac83fd am: fbb3aa72 -s ours am: 65fd0965 -s ours

am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 6096c017 is already in history

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



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