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
am: 6717748e -s ours
Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616