Merge "Follow framework refactoring." into nyc-dev

            android:supportsRtl="true"

            android:allowBackup="false"

            android:usesCleartextTraffic="true"

            android:forceDeviceEncrypted="true"

            android:encryptionAware="true">

            android:defaultToDeviceProtectedStorage="true"

            android:directBootAware="true">

        <!-- Settings -->