DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET....
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc68 am: f72dd414
am: f72b1104 -s ours
Change-Id: I5d0b6cd4522507d6b8cffb88461a546de5b6f519