Merge "Bump Tethering apex version code for S" am: 8b3213f38e am: 8ea56369dc

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

Change-Id: I95bdf8e5baf2ff4a892694ef073700bdc62e8bc6