Merge "Change aapt2 to specify full protos" am: 6787226865

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

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