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