tree 9821a47b006a7df23bd7a6921134891e9955f3e6
parent c45f268aad4ec520da918a72cd75a9099e5812fc
parent 46edb693531309f6a597a3fbc31c85b421e89768
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578727044 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578727044 +0000

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

Change-Id: I5341f0096ebd3e926ae9e3cfd91b3bdbac2e2b5b