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

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

Change-Id: I795daab4a881b78cc6717cee41bfa01637d93e37