[automerger skipped] Convert getAdditionalPlmns to return a Set am: a4e79e3d...
[automerger skipped] Convert getAdditionalPlmns to return a Set am: a4e79e3d am: 4167ae08 -s ours
am skip reason: Change-Id I9dfa5f59512f3d1305187cc383c4069ceaaf27fd with SHA-1 5522de1a is in history
Change-Id: Ia9a7ea9a098118c514ba8a2dbd0d38926fe7d93b