Merge "Change protection level of companion permissions" into oc-dev am: 897f883409

am: 84666dc643

Change-Id: I74c400f5bbf66f8c2032dd2445dfcb0a3ffb4edc

diff --cc core/res/AndroidManifest.xml
index 4811f7a,665e956..5e34e05
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -1894,13 -1879,8 +1894,13 @@@
          android:description="@string/permdesc_useDataInBackground"
          android:protectionLevel="signature" />
  
 +    <!-- @hide Allows an application to set display offsets for the screen.
 +         This permission is not available to third party applications. -->
 +    <permission android:name="android.permission.SET_DISPLAY_OFFSET"
 +        android:protectionLevel="signature|privileged" />
 +
      <!-- Allows a companion app to run in the background.
-          <p>Protection level: signature
+          <p>Protection level: normal
      -->
      <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"
                  android:label="@string/permlab_runInBackground"