Merge "Add onBindClient for testing" am: 53252b14e5 am: 40a22b24b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I528c1bd37b5117ce5adb3e2fa6fec69431e1a50e