Merge "Update cancel device state request to require foreground for cts compat" into main