Merge changes from topic "am-ae06baac9ed24d7e9f2121da1dce10b5" into rvc-qpr-dev-plus-aosp
* changes:
Fix error in RAN conversion in RIL am: e5dd89d4 am: eb51bf61 am: eae6e54c
[automerger skipped] Update ran for manual network selection am: 4aaa08d3 am: f9a52659 am: 49031e1c -s ours am skip reason: Change-Id Ifbea8a6ef85036c82510558d6d229fb4184279c5 with SHA-1 4aaa08d3 is in history