Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 am: 6717748eff  -s ours" into oc-dev-plus-aosp
am: 9431773039

Change-Id: I6f01161b7d11a65585c8da025932c84d32663c92