Merge tag 'android-7.1.2_r36' into nougat-x86

Android 7.1.2 Release 36 (N2G48H)

diff --cc AndroidManifest.xml
index ba5f53f,c155cf7..1864719
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -86,31 -86,8 +86,32 @@@
      <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
      <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
      <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
  
 +    <permission
 +        android:name="android.permission.REQUEST_SUPERUSER"
 +        android:protectionLevel="signature" />
 +
 +    <permission
 +        android:name="android.permission.REPORT_SUPERUSER"
 +        android:protectionLevel="signature" />
 +
 +    <permission-group
 +        android:name="android.permission-group.SUPERUSER"
 +        android:description="@string/superuser_description_more"
 +        android:icon="@drawable/ic_action_permission"
 +        android:label="@string/superuser"
 +        android:priority="10000" />
 +
 +    <permission
 +        android:name="android.permission.ACCESS_SUPERUSER"
 +        android:description="@string/superuser_description_more"
 +        android:icon="@drawable/ic_action_permission"
 +        android:label="@string/superuser_description"
 +        android:logo="@drawable/ic_action_permission"
 +        android:permissionGroup="android.permission-group.SUPERUSER"
 +        android:protectionLevel="dangerous" />
 +
      <application android:label="@string/settings_label"
              android:icon="@mipmap/ic_launcher_settings"
              android:taskAffinity=""