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

[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aae -s ours am: f4016620 -s ours am: 6760f954 -s ours

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

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



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