[automerger] Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev am: 2125e5c5 am: 68cd9845 Change-Id: Iaf5701414366eedc203b4da8252ab979c5246b6d