Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp

am: 1c98867b18

Change-Id: Iad2a374266f3c4c3595d6b1eb06b1433c03b161f
This commit is contained in:
Edgar Wang
2019-08-01 23:14:34 -07:00
committed by android-build-merger

Diff Content Not Available