Merge "Update hashCode in CellSignalStrength classes" am: 59fec059a9 am: f148ec8b72
am: 7ec87ba8a6

Change-Id: Ib53ddcc9957810e50be46482c14e44f4ba4c7b74