Merge "Fix TetheringEntitlementValueListener related API" am: fbcc63d51f am: 16c5a5c6f4
am: 95ca226658

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb