Merge "Merge "Improve Range Checks on CellIdentity Classes" am: 7b2d8029ca am: 684cc9528c" into qt-dev-plus-aosp