tree 502aec52b90cb749eaf381228f5da407bf3d36e0
parent 1c0358aca4f42138fce1c0382df995caf63178ac
parent 3d73b7a832c95d126e172422154492fc27a84b37
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1577354891 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1577354891 +0000

[automerger skipped] Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea am: 3d73b7a832 -s ours
am skip reason: Change-Id I437a6e325112bf9d031a4eb11c28cb755c085bee with SHA-1 af4b43535f is in history

Change-Id: I34e6c966514d9c326ace2d7d17d5ffbb32aabeb0