Merge "Update the system API to support multi client RoR" am: 0b9d85dab5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ada1a901c628025f6d3b221bba85399cf86cb61