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