Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a am: ddc29f77

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

Change-Id: Iea1023f7b39103e4d8b43bd9f0d009b81467a4ad