Merge "[Settings] Avoid access getSubscriberId()"
am: 8cbdf94452

Change-Id: I300bb4a8ea9fd70698656ce8005a7c00ba23b25c