Merge "Merge "Ignore the reboot to normal intent when DSU is locked" am:...

Merge "Merge "Ignore the reboot to normal intent when DSU is locked" am: 4811f1da am: 7a99de2a" into tm-qpr-dev-plus-aosp am: 21e9a302 am: 1682c22e am: b5775fac

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



Change-Id: I9301ee182efb948a15e2c90d308083bc1c8ecfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>