Merge "Fixed java doc for EuiccService#eraseSubscriptions" am: 10d6f20bc9
am: 4dd1013a04

Change-Id: Idbdcc5b47bddaa577113843c4fde7f0115428935