Merge "Make init.userspace_reboot.is_supported a rw property" am: 884b570100

Change-Id: I09a3c3ba50963f2e6e9ecc33a0d9048390c4599f