Merge "Set ro.traced.hypervisor sysprop when enabling traced_relay" into main