Merge "Remove IoUtils from service-permission system-server stubs" into...

Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev am: 7b3cc67d am: 2bc18a3d am: f01f564e

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

Change-Id: I5fccc8d93a310034c66b8a8e8ee4916664f4b423