[automerger skipped] Merge "Migrate GSM SignalStrength to WCDMA on HAL 1.0" into qt-r1-dev
am: 59e186c5 -s ours
am skip reason: change_id I2701106d030511f41f657df5b85957476db80822 with SHA1 4fb2207d is in history
Change-Id: I9ad32a18acb4857704c7dc5640cb3fd484714908