Merge "Add android.software.webview software feature." into klp-modular-dev