Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652461

Change-Id: I5f3ff92cd2091cde4146d429951cec4e2659b16b