[automerger skipped] Merge "Revert "Have...

[automerger skipped] Merge "Revert "Have AssetFileDescriptor.AutoCloseInputStream use pread"" into udc-dev am: 138683c1 am: 794f141f -s ours

am skip reason: Merged-In I3af382c65d9b230901ff15575e394bdcb4e953ef with SHA-1 8bcb6f7f is already in history

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



Change-Id: Ib53ccb6c59071f9f88167f1027fff02a9f20468b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>