am 83a6ec60: Merge change 1791 into donut

Merge commit '83a6ec600259d245b799a99a8e963704db031a63'

* commit '83a6ec600259d245b799a99a8e963704db031a63':
  Add a method to get the PhoneType in CellLocation.