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

Original change: undetermined

Change-Id: Ifb237b10648b6c2130dd3ba3b722acdb686a2450