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

Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a am: ddc29f77 am: eb38e6fa" into rvc-qpr-dev-plus-aosp am: 91b5effc

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

Change-Id: I3d32f383b6bd5d59f94cf6a7879ef02d5773cf42