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

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

Change-Id: Ic74c9fbd5c92e20b989642c4a51bba62867a34a3