Merge "[aapt2] Add placeholder --feature-flags flag" into main