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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e05f57f4ec6b01082c0e1eac97a2a23ce677cbd