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

Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616