Merge "aapt2: add Baklava" into main am: 7ffb76704a

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

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