Merge "Add Sv2 to aapt2 codenames" into sc-v2-dev-plus-aosp am: 831d3e804c

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

Change-Id: If5a7e8df6f0a11e32ace33ae8473e4f417c78ddb