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

Change-Id: I3c67b57b6ea6be072b2cf8166ee92bd1908d8b1c