Merge "Allow passing in a category override to aapt2" am: 8fbb26bf94

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

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