[automerger skipped] Merge "Fix error in RAN conversion in RIL" am: 52770b1c am: 63ff1fa9 -s ours am: 38b30e13 -s ours am: 010d49df -s ours am: 7f1d76ce -s ours
am skip reason: Change-Id Ic93cb16e594d2c48baa0660dd8f9221accf15602 with SHA-1 e5dd89d4 is in history

Change-Id: If02f3a3059573e577bd8ede0785cf23686fa58f6