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

Change-Id: I80d8e46990806c5b4f281fe1166919e9d2db7884