Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream...

Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e am: b1210bb3

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



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