[automerger skipped] Merge changes from topic "tm-remove-iorapd" into tm-dev am: edc7b17c -s ours

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

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

Change-Id: If099a29c0f4fe4b7afc0349dc81ecf8e39e80ace