Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92

am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f

diff --combined AndroidManifest.xml
index 2ec976d,27fe429..c155cf7
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -6,9 -6,6 +6,9 @@@
  
      <original-package android:name="com.android.settings" />
  
 +    <protected-broadcast android:name="com.android.settings.CARRIER_PROVISIONING" />
 +    <protected-broadcast android:name="com.android.settings.TRIGGER_CARRIER_PROVISIONING" />
 +
      <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
      <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
      <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@@ -86,6 -83,7 +86,7 @@@
      <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" />
  
      <application android:label="@string/settings_label"
              android:icon="@mipmap/ic_launcher_settings"