Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing." am:...

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

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

    <!-- Permission needed to test mainline permission module rollback -->

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

    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"