Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fcee
am: 7e80654f56

Change-Id: I860520d24575bd80a93cac175b7941ee6c7685b9