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

Change-Id: I747cc8c44defb017b090fcdc5e033b3b617ab28c