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

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

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



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