Merge "Call PROFILE/DEVICE_OWNER_CHANGED broadcast and onTransferCompleted callback...

diff --cc api/current.txt
Simple merge

diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge

diff --cc core/res/AndroidManifest.xml
index 00e3a4a,72bcdf6..060d664
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -570,8 -566,11 +570,12 @@@
  
      <!-- Made protected in P (was introduced in JB-MR2) -->
      <protected-broadcast android:name="android.intent.action.GET_RESTRICTION_ENTRIES" />
 +    <protected-broadcast android:name="android.telephony.euicc.action.OTA_STATUS_CHANGED" />
  
+     <!-- Added in P -->
+     <protected-broadcast android:name="android.app.action.PROFILE_OWNER_CHANGED" />
+     <protected-broadcast android:name="android.app.action.TRANSFER_OWNER_COMPLETE" />
+ 
      <!-- ====================================================================== -->
      <!--                          RUNTIME PERMISSIONS                           -->
      <!-- ====================================================================== -->

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge