Merge "Fix TetheringEntitlementValueListener related API"