Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a...
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb am: 3c6d6f53 -s ours am: ed799ef6
am: 3e00a43e
Change-Id: I274fafafda952f5426cb7119d1752710f64861ce