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

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

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