Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e2b am: b1210bb389 am: aeeb6b7c17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377375 Change-Id: I2daacb352a7d920d62faad0dd5a86aa41e7e5b21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: