[automerger skipped] Merge "Bump Tethering apex version code for R" am: 5bd49caf78 -s ours am: 35448220a6 -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: If2aae37b3e20ab114b880d1a3f256f29bf9fe04f