Ensure that LockSettingsService waits for gatekeeperd to be ready am: e59460902b am: 9e9f7294ae

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

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