[automerger skipped] Merge "Fixed incorrect RAT set in PS WWAN registration info" am: af6c6226
am: 6b8e478c -s ours
am skip reason: change_id I1a1f9dd692a6920dfbe5177a9098643d2c24913a with SHA1 feefb2d7 is in history
Change-Id: I04759c83a474d78b4eac82330b8a6ac0ab81f8b2