Merge "Fix java doc for eraseSubscriptionsWithOptions"
am: 8db38c9ef6

Change-Id: I55feb7a5515aa05dea0b5482f6d84b67c6686948