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

Change-Id: Ie688b9007a3432642d1573e0ea349ddb758cf753