[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95
-s ours am: 66f8db84d6
-s ours am: 901e7377cc
-s ours am: 1017ec16c0
-s ours am: b7c547504a
-s ours am: 6d61f05f14
-s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29911394
Change-Id: Ic755ae5c5d788eb768d52793328e65c383582a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: