Merge "Add a flag to enable/disable SupervisionService based on whether the device is being managed by the supervision role holder." into main