Merge "Make userspace_reboot.in_progress sysprop-as-api"