Merge "Properly fail userspace reboot if it's not supported" am: 2af5bd00b0

Change-Id: I5bfed4253a2eddde7930c64a3aefa0b87902cfc9