Merge "Remove settings to relax device ID access restrictions" into qt-dev am: 692a68133b am: 949e343a1c
am: a2cbc25b22

Change-Id: I3727fa26d8c591adb8553fc6b9fb36e819136e1b