Merge "Revert write secure settings permission protection level." into mnc-dev

    <permission android:name="android.permission.WRITE_SETTINGS"

        android:label="@string/permlab_writeSettings"

        android:description="@string/permdesc_writeSettings"

        android:protectionLevel="normal" />

        android:protectionLevel="dangerous" />

    <!-- @SystemApi Allows an application to modify the Google service map.

    <p>Not for use by third-party applications. -->