Merge "Add an 'android.software.app_compat_overrides' feature" into sc-v2-dev