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

Change-Id: If559af58f06c0b7d8e9c118752cfdf82877761e7