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

Change-Id: I54d5aba18bc6925273668b3a9b940445d6a2a4ca