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

Change-Id: I21f1ef5c693ffb3d88d5067456c8418f037b4f4c