Merge "Change scope of ro.init.userspace_reboot.is_supported to public"