Merge changes Ic8632068,I7606dad8

* changes:
  LockSettingsService: reject null keys in setString() et al.
  LockSettingsStorage: gracefully handle null keys in database