Merge "Ignore the reboot to normal intent when DSU is locked" am: 4811f1daee am: 7a99de2a88

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

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