Merge "Change scope of ro.init.userspace_reboot.is_supported to public" am: 60ddf3a29a am: 03fd199578 am: cdea887a1f

Change-Id: I1861d5466ec021484095d6f1c6ff83079aae2f3c