[automerger skipped] Merge "Bump Tethering apex version code for R" am: 5bd49caf78 -s ours am: 35448220a6 -s ours am: 88ce5927f8 -s ours

am skip reason: Merged-In Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is already in history

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

Change-Id: Ifd9c00be7d8575c9dee05462542460e80330732d