Merge "Fix TetheringManagerTest failure when using entitlement required SIM" am: 1691078821 am: fbd2113de5 am: b2d14f1589

Original change: undetermined

Change-Id: Ic729c86bddd41a75538a5a80908b064e84d9bc6b