Merge "Update how flag read only status is passed to aapt2" into main