Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us..."

Revert "Revert "Add cts test to verify 2 AssetFileDescriptors wo..."

Revert submission 16067235-revert-15961171-168310122-WKLKVKBBZJ

Reason for revert: Roll forward with fix
Reverted Changes:
Ib22b0fef5:Revert "Have AssetFileDescriptor.AutoCloseInputStr...
I19715aff7:Revert "Add cts test to verify 2 AssetFileDescript...

Test: ran previously failing tests locally
Change-Id: I470a777e05e3b85caa408d846bda7ddba3f8cfd0