[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours

am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history

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

Change-Id: Icc0d493d7c6ff7e7dcf444309676ca8453c0894a