Merge "Expose error code for RoR reboot system API" am: d5547af728 am: 2cf5387b09 am: 133568e964

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

Change-Id: I9cda23318ea0cab9c2e37e7a5967bed81a3188c7