Merge "Add Keyguard DPM state change callback" into tm-dev am: 1620daee63 am: 86d40ae3f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17379563 Change-Id: Icd08bab14902022f85bef774ce95a0d3ebe70c15 Signed-off-by: Automerger Merge Worker
This commit is contained in: