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

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

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