Merge "Make init.userspace_reboot.is_supported a rw property" am: 67ee6aeb am: ece1219e am: 6017e36d am: 013a2fd5 Change-Id: I91d995a5942dd55dfc7c1d1651b82f4314a59a1a