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

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



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