Merge "Bump Tethering apex version code" into rvc-d1-dev-plus-aosp am: 491463a3 am: 2e5154b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12890938

Change-Id: I9bf34252d723acb513935596e93ab8d748187041