[automerger skipped] Merge "Add an error code for RoR failure due to no...

[automerger skipped] Merge "Add an error code for RoR failure due to no network" into sc-dev am: 5262ee15 -s ours

am skip reason: Merged-In If600e8e06d7707da7160fec66d71bc9341327965 with SHA-1 7c473650 is already in history

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

Change-Id: I7b0b44e64ad2e3ae573b6c7bf96af017a750b332