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

am skip reason: Merged-In I66f027cd08d0fe8a98b3d8440a1c3908ac57df07 with SHA-1 d7ffb4bea9 is already in history

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

Change-Id: I9640bce380d8c3e99132e6b3f33d42b1ecd9efee