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

Original change: undetermined

Change-Id: I5012aaa578b6c172f57ebc0afdf48f640fdacbfa