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

Change-Id: If08184967a17c28001b15917b390de25f8d9b4f7