Merge "Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList.""