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

Change-Id: I5341f0096ebd3e926ae9e3cfd91b3bdbac2e2b5b