Merge "aapt2: Fix deprecated proto API usage." am: 29926802 am: aeaa62c5 am: d682efe2

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



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