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
Change-Id: Ic524f1c10de53d0a9974afc4033c334ad871de4a