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

Change-Id: Iecf9903356794b13ce628843d0dfda821d6305d3