Merge "Check null for before using LockSettingsService" am: 964fccfefd am: e3e7ed125e am: a90fe61200

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

Change-Id: Ief6c22eddb92b24a79155724f41bdd0ed5e4ab09