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

am skip reason: Merged-In I398485145e38ad68693bb39ed1581ff1daae07a0 with SHA-1 dc45e28d44 is already in history

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

Change-Id: Ibe7edc0cb9e5bcbe2961a11138e034887ea931b5