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

Merge "Revert "Pass --non-updatable-system flag to aapt2 when versionCode is unspecified"" into main am: fc767787

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



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