Merge "Stop using single-hyphen metalava options" into main am: 18801036 am:...

Merge "Stop using single-hyphen metalava options" into main am: 18801036 am: 552bba8f am: 5117cdf8 am: 23679dd6 am: 3b81eca7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2700874



Change-Id: I0075a192e347d26f2235553330f94be3ab07e61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>