DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520

diff --cc src/com/android/settings/notification/AppNotificationSettings.java
index 9ebcd33,bbfbe5e..b5a07ce
--- 1/src/com/android/settings/notification/AppNotificationSettings.java
--- 2/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@@ -21,13 -23,15 +23,15 @@@ import android.app.NotificationChannelG
  import android.content.Context;
  import android.os.AsyncTask;
  import android.os.Bundle;
 -import android.support.v14.preference.SwitchPreference;
 -import android.support.v7.preference.Preference;
 -import android.support.v7.preference.PreferenceCategory;
 -import android.support.v7.preference.PreferenceGroup;
 -import android.support.v7.preference.PreferenceScreen;
 +import androidx.preference.SwitchPreference;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceCategory;
 +import androidx.preference.PreferenceGroup;
 +import androidx.preference.PreferenceScreen;
  import android.text.TextUtils;
  import android.util.Log;
+ import android.view.Window;
+ import android.view.WindowManager;
  
  import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
  import com.android.internal.widget.LockPatternUtils;

diff --cc src/com/android/settings/security/ScreenPinningSettings.java
Simple merge