Merge "DO NOT MERGE: Remove the development privelege level from...
Merge "DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc68 am: f72dd414 am: f72b1104 -s ours" into oc-dev-plus-aosp
am: be09e437
Change-Id: Ib322b18afd1f084152c2c95fc78b2aac3005f4f8