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

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

Change-Id: I6aabf1250d67f6a79711e89fb05c68bf84849656