[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: bc358528fe
-s ours am: 559fb5441d
-s ours am: 73064f1b5a
-s ours am: 7dfe8021fe
-s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 c70e6bf477
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784981
Change-Id: Ie955aa28372154edcb308fdda37eb2ce1f28671e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: