Merge "Merge "Fixed a invalid fd issue" into rvc-dev am: 6f8ee88a am: ddc29f77 am: 9ce920ae" into rvc-qpr-dev-plus-aosp am: 5637720e

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

Change-Id: I062025b99869a84e71d1d46270a1f1708bd20c36