Merge "[res] Add a feature flag for android resources RRO fix" into main