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

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

Change-Id: I96d48a205fb1f2d3a6b353e2b2ea36383c20eb2f