Merge "Clarify DelegateManagerCallback based on API review" am: 95fe9715bc am: 4678139c3b

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

Change-Id: I992e94cb58883b495bad31361801ce4b809cdf6b