[automerger skipped] Merge "Fix TetheredClient callback fail in...

[automerger skipped] Merge "Fix TetheredClient callback fail in InProcessTethering" into mainline-prod am: 19d19662 -s ours

am skip reason: Change-Id Ic04e44aef4df772c718ff25ed331bf02f5940c1d with SHA-1 de20bb0e is in history

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

Change-Id: I2b9b03b75c6b41532146a722a8fc4f8677b05729