[automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863
am: 2688ddf907
-s ours am: c62982e22d
-s ours am: 744e8a83f6
-s ours am: f22aa1453d
-s ours am: e5704f8892
-s ours
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982
Change-Id: I9015fb233be9f677ffe31a600398a70608a56b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: