Merge "Bump Tethering apex version code" into rvc-d1-dev-plus-aosp