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

[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e8 am: 90fc8832 -s ours am: ba4746f0 -s ours am: 6ebe81fd -s ours am: cac4ef6c -s ours

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

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



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