Merge "Make return values of IContextHub.aidl more consistent"