Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is true" into qt-dev am: 1970cfddb3" into qt-dev-plus-aosp