resolve merge conflicts of 94c5202965 to oc-dr1-dev

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf

diff --cc AndroidManifest.xml
index a5affc9,25216db..5419fac
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -83,7 -82,7 +83,8 @@@
      <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
      <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
      <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
 +    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
  
      <application android:label="@string/settings_label"
              android:icon="@drawable/ic_launcher_settings"

diff --cc src/com/android/settings/accessibility/AccessibilityServiceWarning.java
Simple merge

diff --cc src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index ae57f06,07f4c37..04456c2
--- 1/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
--- 2/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@@ -16,8 -16,7 +16,9 @@@
  package com.android.settings.accessibility;
  
  import static android.content.DialogInterface.BUTTON_POSITIVE;
+ 
 +import static com.android.settings.Utils.setOverlayAllowed;
 +
  import android.accessibilityservice.AccessibilityServiceInfo;
  import android.app.Activity;
  import android.app.Dialog;

diff --cc src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
Simple merge