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

Change-Id: I1bb12eaca6f0efffd728be1d7e9c6d3d2fa9efa8