Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am: 38529959bf  -s ours

Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff