Merge "Use new metalava signature-to-jdiff sub-command" into main am: 6b3592a11f am: 382e7161dc am: 77beb046f9 am: 05833f9fc2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2654042

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

api/Android.bp

@@ -60,14 +60,14 @@ python_test_host {
 metalava_cmd = "$(location metalava)"
 // Silence reflection warnings. See b/168689341
 metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
-metalava_cmd += " --quiet --no-banner --format=v2 "
+metalava_cmd += " --quiet "
 
 genrule {
     name: "current-api-xml",
     tools: ["metalava"],
     srcs: [":frameworks-base-api-current.txt"],
     out: ["current.api"],
-    cmd: metalava_cmd + "-convert2xmlnostrip $(in) $(out)",
+    cmd: metalava_cmd + "signature-to-jdiff $(in) $(out)",
     visibility: ["//visibility:public"],
 }