Merge "Update the OWNERS file for locksettings" am: 14e70a6510 am: 25ebb2bea4 am: 56afaf2c18

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied7a9bd35d64e1914607c623152d0162d85ecb40