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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc4d753f99904567b57b29fcf2f20e2aef26f03d