Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permissi...

diff --cc core/res/AndroidManifest.xml
index 8ed76de,1eeb186..f8044e2
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -1899,8 -1892,12 +1899,12 @@@
      <permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"
                  android:label="@string/permlab_useDataInBackground"
                  android:description="@string/permdesc_useDataInBackground"
 -                android:protectionLevel="signature" />
 +                android:protectionLevel="normal" />
  
+     <!-- @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" />
  
      <!-- ================================== -->
      <!-- Permissions affecting the system wallpaper -->

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