Merge "Make userspace_reboot.in_progress sysprop-as-api" am: 300448a88c
am: b711442fde

Change-Id: Ie7d489d38ece1a03bdec9fdc86a83a429aef67d7