Merge changes from topics "b/200924402", "composd_race"

* changes:
  Fix lazy service persistence for VS
  Don't start authfs until fd_server is ready