Merge "Merge "Remove settings to relax device ID access restrictions" into qt-dev am: 692a68133b" into qt-r1-dev am: 9ca64ba7c5
am: 75f1f921ab

Change-Id: Ie8cd541c34eb3816d6d288d03bcd437b4457c9c2