Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions" am: 451c6a80e5
am: ded3d9152e

Change-Id: Ibbcb82cf7d2eb0c51e1b4f6c290e1acc8cc628c5