Merge "Disable DSU in executeRebootToNormalCommand()" am: 0b6bf88ccd am: f785394fb3 am: b8f884150d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470783

Change-Id: I80dad6f69ae2305b15ffff3cf0ce078cbca592bd