[automerger skipped] Merge "Set class name when...

[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b682 -s ours am: dc418ca7 -s ours am: 6f3bb938 -s ours

am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 417970a8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29913410



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