Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into...

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

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



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