Merge "Allow shell to disable keyguard when not secure" into mnc-dev

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.BLUETOOTH" />

    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />

    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />

    <!-- System tool permissions granted to the shell. -->

    <uses-permission android:name="android.permission.REAL_GET_TASKS" />

    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />