Merge "[aapt2] Add --non-updatable-system flag" into main