Merge "Change Nci to CellInfo.UNAVAILABLE_LONG" am: 5619ee97bf am: eb52e08c30

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676432

Change-Id: Ib7ad3a9b44399c673fae3f0b2df9ec3fcabed398