[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: aad0b6827b -s ours am: dc418ca7bf -s ours am: 6f3bb938f7 -s ours am: 75137218b1 -s ours am: f8e44f03e7 -s ours am: 52839fc54e -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: I13d94ad34948439e4d6fb0807f58e5589b215061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: