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

Change-Id: Ic8cc4a537cacd42304c578d7373b6ca3eda78ffd