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

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

Change-Id: I7109614a931e0ca7b19ca680cf4704385c611a01