Merge "Merge "Make usage of revocable fds for reads configurable." into...

Merge "Merge "Make usage of revocable fds for reads configurable." into rvc-dev am: 14849cfb am: 081246dc am: 3bdb03ba" into rvc-qpr-dev-plus-aosp am: 9cf18bc7

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

Change-Id: Ia984dea4910dce35381be2aa5e3a59eaee298fbb