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

Change-Id: I678920b9b4884ee648dc98e2777f313182df6ddd