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

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

Change-Id: I35c030f1059d23854a2f8716ade2b4c05c3644fe