Reorders arguments in Context Hub Service methods

No functional change, just reordering things in internal methods to be
consistent with the API definition. Also fixes stale javadoc.

Bug: 117612105
Test: Compile only
Change-Id: I455d3d5c8f1d5077dbacfa96ad1c71da27559b8e