Merge "Replace --api-overloaded-method--order with --format-defaults" into...

Merge "Replace --api-overloaded-method--order with --format-defaults" into main am: 93961bfb am: 3f23d268

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



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