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: I001aea36b99da8cf3c209fb3c5c316200b0d08a2