[automerger skipped] Merge Android U (ab/10368041) am: 3e176e8a21 -s ours am: 2fbd9f23b6 -s ours am: ea442f1487 -s ours am: 560a8ee956 -s ours

am skip reason: Merged-In I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf with SHA-1 f2160038b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/24182707

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