Merge "Use new merge-signatures metalava subcommand" into main am: 4ab9b3c2a1 am: aff61356f9

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

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