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

am skip reason: Merged-In I9a21dcc004c497912bf9aeae2938fd4e43aea4f6 with SHA-1 8ebac3744d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/metalava/+/16844115

Change-Id: I3b5834c666fe9bce3ef2ef2f0cc69c4d56ec00f6