[automerger skipped] Merge changes from topic "aosp-remove-iorapd" am:...

[automerger skipped] Merge changes from topic "aosp-remove-iorapd" am: fbd7a9c1 am: f299eca2 am: 9195bd01 -s ours

am skip reason: Merged-In I560a66eec4050d60b74ad325328128cd3e299662 with SHA-1 c8f7613b is already in history

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

Change-Id: Ib3171c80c095ecc50c88a21c92a242e3e484b56e