Merge "Fix double-close on direct channel registration" into tm-qpr-dev am:...

Merge "Fix double-close on direct channel registration" into tm-qpr-dev am: ed1fc29d am: feb9ee88

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



Change-Id: I6c54ad75f4c827f5a4fc2012bef81db29e6d8e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>