Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET...
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev am: f4abac4d -s ours
am: d9251bad -s ours
Change-Id: Ia059d6a9eb146abedd2f05953c79362b457eab97