Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1

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

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