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