Merge "Replace `--dex-api` with `signature-to-dex` instead" into main am: 15181c7139 am: 36f579b6cd am: fd6c4f6083

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

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