Merge "locksettings: allow {get,set}-disabled without providing current LSKF"...

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

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



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