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

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

Change-Id: If84a7df3a08ebda9687bbd0481fddf0c87e33b58