Merge "Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee...

Merge "Merge "Add tron metrics to track iorap." into rvc-dev am: f40975ee am: 17eca290" into rvc-d1-dev-plus-aosp am: 65dce9a9

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

Change-Id: I9bc51931f8542c64d5d452f7240ec742913b3709