Merge "Add multi client ror support" am: fa7173b8ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2c73984af2b0db71794f0f029daac02e9f1529a