Merge "Add function to encode PLMNs" am: f681744863
am: 3e8650c5d1

Change-Id: I057625e6b6dbaab35b9070c174c9a4daa5e9b2cc