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

Change-Id: Id12dd73ed18fee0b874af364bad954d39384287f