Merge "Add multi client ror support" am: fa7173b8ac am: 0572043849

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9099a372d0612e96c409029ca79fc7ecfbf06648