Merge "Mainline use cellSignalStrength instead" am: 953ab80e0b am: 5693d157bd

Change-Id: I4445d70a94da15cadfff8c795397494c36f51c30