[automerge] Merge of apache-commons-io from aosp/master 2p: baaf5b1d62 am: 760ce9058b

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-commons-io/+/21545784

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