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

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

Change-Id: I52ec59c367013cb50c68f6e13b50c97c7ecbbfec