[automerger skipped] Merge "Update AAPT for S V2." into sc-v2-dev am: af23af4c am: d5f12360 -s ours

am skip reason: Merged-In I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a with SHA-1 534f2982 is already in history

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

Change-Id: Ib58ebdddee403a077186ac276c91f12acd092301