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
am: ed799ef6fb

Change-Id: I61b21b6fe6e3bbb97b8cc2f67f7d66a9c66ef943