Merge "Add a flag to enable the SupervisionService on Wear devices." into main