[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: a79b09239e -s ours

am skip reason: Merged-In Ibfb83db738a67d266856966042486edc57473649 with SHA-1 ef9f62b076 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/16843138

Change-Id: I0dc891f0856fdc6da0c92114e082c013766fe173