Merge "Fix TetheredClient callback fail in InProcessTethering" am: 3ed624fb2e am: 3b5d49b7bb am: 4ac111af72

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

Change-Id: I324a11ae925a120ad19d841fd7e136aa07607cd5