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

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



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