Merge "Catch service exceptions in AidlContextHubWrapper"