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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439a050bdbf86651193eccc015c19b48754b69a0