[automerger skipped] Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev am:...

[automerger skipped] Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev am: 7936210c -s ours am: bce33c97 -s ours

am skip reason: Merged-In I3f136f505bce80d0eb7f8b0cca316041730a4580 with SHA-1 a1250b59 is already in history

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

Change-Id: I3045328edff5c7cda0873d78c723742c54aa5d1c