Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is...
Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is true" into qt-dev am: 1970cfdd" into qt-dev-plus-aosp
am: eadbe7c5
Change-Id: I47c1906428f220c4fb150242db593aff00b848af