Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into udc-dev am: 0dda4e11e6 am: 5a17b520be am: b72a2abd90 am: cffd0244bf
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>
This commit is contained in: