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

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

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