[automerger skipped] Ensure that LockSettingsService waits for gatekeeperd to...

[automerger skipped] Ensure that LockSettingsService waits for gatekeeperd to be ready am: e5946090 am: 9e9f7294 am: e1defa04 am: 73ccc0fd am: e4098a22 -s ours

am skip reason: Merged-In I815151cc6024c447bf3eff194a911ecdaab22d10 with SHA-1 cdd03b77 is already in history

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



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