Merge "Fix bug, AccessNetworkType.NGRAN was not mapping IRadio1.1 in Android...
Merge "Fix bug, AccessNetworkType.NGRAN was not mapping IRadio1.1 in Android R" into rvc-dev am: d03869d0 am: 1771a9c5
Change-Id: Ia9e86110da6f9fa19f8424e14e82977a8ede248a