[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 -s ours

am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436

Change-Id: Ie8842b5695565100b8ae992672a63ee5689e5467