Merge "sync RadioError from IRadio 1.6" am: 9c06156252 am: f56624d96f

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

Change-Id: I1cc8b66fdaeeb451482be61f3f38a484d7d9c6b3