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

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

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



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