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

Change-Id: Ibcc15c236e7b36d83a0c2ba51b54f3e7ac8b9408