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

[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f -s ours am: 66f8db84 -s ours am: 901e7377 -s ours am: 1017ec16 -s ours

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

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



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