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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I403bc7049cbb3d1c11dd48eae308e7ed69668aff