Merge "Allow apps to read ro.init.userspace_reboot.is_supported"