Merge "Replace `--dex-api` with `signature-to-dex` instead" into main am: 15181c71 am: 36f579b6

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



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