[automerger skipped] Merge "Fix bug, AccessNetworkType.NGRAN was not mapping...
[automerger skipped] Merge "Fix bug, AccessNetworkType.NGRAN was not mapping IRadio1.1 in Android R" am: 3809edb0 am: 48632bba -s ours
am skip reason: Change-Id I5dfd75d3783f81ea74986ed581d64661f20f98d1 with SHA-1 ec316f6b is in history
Change-Id: Iadaeb67ba58d43993fff2a87106defffa34192a3