tree f1dc939213892d4be03e23dbd8b7de127b7ea147
parent 93f65f6df7c4e3534d9b551d101488f7c19034ee
parent 3486372d69782073b5cebe07dee14ff580a2531f
author Tao Bao <tbao@google.com> 1556576678 -0700
committer android-build-merger <android-build-merger@google.com> 1556576678 -0700

Merge "Consolidate the codes that handle reboot/shutdown." am: 189c8f9aeb
am: 3486372d69

Change-Id: I08b9755b1493f7c658b5ea0a076a4f9b59f5fcbe