Merge "Deprecate TelephonyManager.getNeighboringCellInfo()" into mnc-dev