Merge "Fix consumer closed input channel cause an error occurred (2/2)" into rvc-dev am: f9d44007 am: 2e5740bf

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

Change-Id: I818b16e2598deca47d512e7f3ce6283762d5e8d8