Merge "Mark eraseSubscriptions as @SystemApi." into pi-dev
am: b8651f6fba

Change-Id: I31b7c560e9e2c0c6163b2f4214d897ddc279f51a