[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours am: fa16033923 -s ours am: 16aed59b07 -s ours am: dc345a71c3 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777

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