Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022

Original change: undetermined

Change-Id: I1cb37809d814f408f05072b81a9fea613ea40934