Merge "remove inprocess tethering" am: 5bbc1a4021 am: 22c65c200b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594625

Change-Id: Icefdcc52b958ce591e6e33dcd20b8691fb6ca308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>