[automerger skipped] Merge changes from topic "tm-remove-iorapd" into tm-dev...

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

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

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

Change-Id: Ic0cf1ae68e900a34eb76dcf5e919557503d1adfc