Merge "Fix TetheringPrivilegedTests crash" am: 4e141d9514

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879622

Change-Id: Ia7dfa9f1acfdd6e6a73dd4414242f5477970b3b1