Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
am: f4abac4d8f  -s ours

Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0