Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in...
Merge "Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev am: e45e09fc am: 7e80654f" into qt-r1-dev-plus-aosp
am: c7fc462e
Change-Id: Ica7f171d057a8e7150fb91b16c7050719bd3f9f1