[automerger skipped] Merge "Mainline use cellSignalStrength instead" am: 953ab80e0b am: 5693d157bd am: 82c75c6eae -s ours
am skip reason: Change-Id I93e9dc09a01aa76b7d26660a32944df79cda93f3 with SHA-1 7e66fbd162 is in history

Change-Id: Ia688b6e7cbbd6f2173d04fd5ae066c55161a97ab