Merge "Add locksettings unit tests to presubmit" am: 643fb23a74 am: ffa9add6c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a3638ae90b88f68bcc770f32a4d379ce22c7877