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

Change-Id: I5c1599e060dd60126eff28b47304dff8c2d194b8