Merge "Pass --non-updatable-system flag to aapt2 when versionCode is...

Merge "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified" into main am: 0ef70956 am: 27c00a8b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3076227



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