Merge "Fix consumer closed input channel cause an error occurred (1/2)" into rvc-dev am: 488cd2c4 am: f6cc81bf

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

Change-Id: I215ddd1887ac22cae014dafc22249b6c0198e083