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
am: 3e00a43eb0

Change-Id: I274fafafda952f5426cb7119d1752710f64861ce