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

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

Change-Id: Ib96dabb28c887031ebf79e70d4810f86832b629d