Merge "Add a skeleton for userspace reboot CTS tests" am: b3d565321d am: e4210443b3

Change-Id: I00e88d3208b35ed3ec8b414e4df28ddf460ea2fb