Merge "Ignore the reboot to normal intent when DSU is locked" into udc-qpr-dev am: 618bf29a am: fa73dac4

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



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