Merge "Ensure TetheringService binder is alive after system_server crash" into main