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

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

Change-Id: Ic2c46a4328e728f2a62644ee43c0f9e415318d62