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