Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into udc-dev am: 0dda4e11

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214159



Change-Id: I7a2e8bcc2cd08a0a4c4e778928cfeecee267ed82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>