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
am: 27b18cc6 -s ours
Change-Id: I5f7dbc0f5a03bf0e60dbbcb948b911fc6cc692b2