[automerger skipped] Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431 am: 4359db04 am: b2062089 -s ours
am skip reason: Change-Id Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1 with SHA-1 353926a4 is in history
Change-Id: Ie12e64a32b2c403151f7dab6406ac80967a2e206