DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am: 31add96517 am: a701205315
am: 27b18cc632  -s ours

Change-Id: I5f7dbc0f5a03bf0e60dbbcb948b911fc6cc692b2