Merge "locksettings: allow {get,set}-disabled without providing current LSKF" into udc-dev am: 1b5a3d7c am: 1b82bb18

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



Change-Id: I3137b59d30113501da848dc358549d90bcd00591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>