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

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016