Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE."

    <!-- Allows access to keyguard secure storage.  Only allowed for system processes.

        @hide -->

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

        android:protectionLevel="signature" />

        android:protectionLevel="signature|setup" />

    <!-- Allows applications to set the initial lockscreen state.

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