Merge "Change aapt2 to specify full protos" am: 67872268 am: 3da3dce7

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



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