[automerger skipped] Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions" am: 451c6a80e5 am: ded3d9152e
am: 75fb6b1edf -s ours
am skip reason: change_id Ic11bae7a24c99995b76dd4c5ef764f8a87deed52 with SHA1 c0bb377bb4 is in history

Change-Id: I58dd032010240955794dc2b4b650ca6171d65baa