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

Change-Id: I2038a5395a0917d13080d204f429c8847006edc5