[automerger skipped] Merge "Use Uppercase instead of Lowercase for PLMN Decode" am: e61215cab1
am: df00ad1a4b  -s ours

Change-Id: Iaca1e63e9f9f5606c388f2bf4c1180145d0abb5e