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

am: c7fc462eb4

Change-Id: Ica7f171d057a8e7150fb91b16c7050719bd3f9f1
This commit is contained in:
Jovana Knezevic
2019-06-05 15:59:00 -07:00
committed by android-build-merger

Diff Content Not Available