Merge "Use new merge-signatures metalava subcommand" into main am: 4ab9b3c2...

Merge "Use new merge-signatures metalava subcommand" into main am: 4ab9b3c2 am: aff61356 am: 1b77c29e

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



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