Merge "[Secure Channel] Resolve Ukey2 Client Init collision edge-case" into udc-dev am: 0dda4e11e6 am: 8ea7482839 am: e01a0ff578 am: 6d8c869336
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214159 Change-Id: I187dc3aed755d89c27717a74dde5fd3d9fb97cbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: