Merge "Update AAPT for S V2." into sc-v2-dev am: af23af4c83

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

Change-Id: I6b713a4e45e82d2a0ed2a117d505cbd84aea4175