Merge "Clean up the multi-client ror code" am: 1fb84f4d31 am: 6b73b7628a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99289be058e781731d0b1b5ee2ab41a506e22ddf