Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
am: 628d311d0c

Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd