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

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

Change-Id: Ibb30260e9bc558ab0aa6dd8277dfd50efd14258f