Merge "Add ncid to CellLocation in CellIdentityNr" into rvc-qpr-dev

telephony/java/android/telephony/CellIdentityNr.java

@@ -138,7 +138,11 @@ public final class CellIdentityNr extends CellIdentity {
     @NonNull
     @Override
     public CellLocation asCellLocation() {
-        return new GsmCellLocation();
+        GsmCellLocation cl = new GsmCellLocation();
+        int tac = mTac != CellInfo.UNAVAILABLE ? mTac : -1;
+        cl.setLacAndCid(tac, -1);
+        cl.setPsc(0);
+        return cl;
     }
 
     @Override

telephony/java/android/telephony/gsm/GsmCellLocation.java

@@ -55,7 +55,7 @@ public class GsmCellLocation extends CellLocation {
     }
 
     /**
-     * @return gsm cell id, -1 if unknown, 0xffff max legal value
+     * @return gsm cell id, -1 if unknown or invalid, 0xffff max legal value
      */
     public int getCid() {
         return mCid;