Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am: 9e3c9eeb96

Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b