Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da

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

Change-Id: I5fc640360434adc032c2bc3691e9fd15eb5ea4b9