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

Change-Id: I8884f4b01a3980bfc00e9a57ea1b8c43c27578d3