Merge "Update documentation for SubscriptionManager listener"
am: 75a0066880

Change-Id: I1f353b08d03a9c0f10bc70d2b96a44d79437cc49