[automerger skipped] Merge "Fix java doc for eraseSubscriptionsWithOptions" am: 8db38c9ef6 am: aeeff0287c am: 20c9b8e520
am:d3c5ae687e-s ours am skip reason: change_id I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803 with SHA1406cee2b72is in history Change-Id: I97fb222360b4086100e9b7c88db71e045f29f0b7
This commit is contained in: