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

Change-Id: I7bd0d19f50df889fb8ff8653a0e9f70995dee18d