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

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

Change-Id: Ie3cccfbeb1d4d187bcf2282fe0fcdbcbc22ca261