Merge of apache-commons-io from aosp/master

Bug: 262898801
Test: mma
Change-Id: Ied6526baf6fc561270043ddf4fac996103419041