Merge "Mainline use cellSignalStrength instead"
am: 953ab80e0b

Change-Id: I7c5b2aca8cdde8654320aefa468ed86820f2280d