Merge "Fix TetheringEntitlementValueListener related API"
am: fbcc63d51f

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887