Merge "Add onBindClient for testing" am: 53252b14e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2f48ba063315842a07972dac2cfce9b01befad4