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 am: 43346642" into oc-dev-plus-aosp
am: 837dd545

Change-Id: I2ee01c0f3094f1aa97c91a8b2e6ee139a715121d