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

Bug: 139369544
Change-Id: I835905a51836e7218f0be8c25335b9548ae6b2d3

diff --cc core/java/android/os/Binder.java
Simple merge

diff --cc packages/VpnDialogs/AndroidManifest.xml
index 1d0b9b6,05ce96c..1f49aa1
--- 1/packages/VpnDialogs/AndroidManifest.xml
--- 2/packages/VpnDialogs/AndroidManifest.xml
+++ b/packages/VpnDialogs/AndroidManifest.xml
@@@ -20,8 -20,8 +20,9 @@@
          package="com.android.vpndialogs">
  
      <uses-permission android:name="android.permission.CONTROL_VPN" />
 +    <uses-permission android:name="android.permission.CONTROL_ALWAYS_ON_VPN" />
      <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
+     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
  
      <application android:label="VpnDialogs"
                   android:allowBackup="false">

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java
Simple merge

diff --cc telecomm/java/android/telecom/TelecomManager.java
Simple merge