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

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



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