Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3 -s ours
Change-Id: Ic4af1cac3a0929db20eccd0693ec5fad834b0093
This commit is contained in: