Merge "hidl getService throw correct exceptions." am: 5d5ace5e11
am: 197b62d3fa

Change-Id: I720e34630733e27734f050d6546be4df1a1948ab