Merge "Fix TetheringPrivilegedTests crash" am: 4e141d9514 am: f1dfa0e50b am: fc829880c3

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

Change-Id: I56662b24fdffe9675fa40b2e85f6024838b47b1c