Merge "Fix registerDirectChannel in HAL wrappers" into tm-dev am: 35556594 am: d687adc6

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



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