[automerger skipped] Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022 am: 9e9f0ac4a4 -s ours am: 775e3a2b2f -s ours

am skip reason: Change-Id I85299841d60afba97ffcc4ae908a85e51139319b with SHA-1 f74fce0d0c is in history

Original change: undetermined

Change-Id: I3644559ef2df1564aeca86f51d3cdd13075e61c2
tree: 924e3f8490909462a81c33c2e782424e06b51c09
  1. tests/