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

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

Change-Id: Ia7b8354928340e8ba89674eadf4d804195e43e29