Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122