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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8a094bf80c3fb0990d7011424f00508dcbcc356