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

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



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