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

Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2