DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*...
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
Change-Id: I2c67e135cfa5d423acd322d1a797222c7018bb2f