Merge changes from topic "locksettings-aosp-3" into main

* changes:
  LockSettingsService: fix names of user lifecycle methods
  locksettings: Don't use AIDL V1 weaver
  Reconnect if weaver service connection dies
  Replace isWeaverAvailable() with getWeaverService()