[automerger skipped] Merge "Fix TetheringManagerTest failure when using entitlement required SIM" into rvc-dev am: b32b775022 -s ours am: 40daee66ba -s ours
am skip reason: Change-Id I85299841d60afba97ffcc4ae908a85e51139319b with SHA-1 caee6ff9cb is in history
Original change: undetermined
Change-Id: I48a1082b7ff201266fab48cca9d43fbddb773d66
This commit is contained in: