Merge "Merge "Check Exception Code for Service specific error" into tm-dev am: cb1fd25a53 am: 9ca2e34fd4" into tm-d1-dev-plus-aosp