Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to...
Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am: 31add965 am: a7012053 -s ours" into oc-dev
am: 9e3c12e1
Change-Id: I4b5a02f21a394aaa5ec73c88070fdb853b49d68c