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

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

Change-Id: If082dba227e179d7e83c7521a5a88f19e4ac1d38