Merge "Add function to encode PLMNs"
am: f681744863

Change-Id: I948db19cbc57f549b880d42200ea4164f4132490