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

Change-Id: I3312fae325c593aef750c80cbd4365dfd2669f6c