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 am: 58d5327f

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



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