Merge "Whitelist reboot reasons related to userspace reboot failure" am: abe52dcb88

Change-Id: I8716d3b868b7142049329aa9cdc15b6f37c1abac