[automerger skipped]Merge "Don't turn off signal strength update in power save...
[automerger skipped]Merge "Don't turn off signal strength update in power save mode." am: 7db1fd7b am: 3ff26fc8 -s ours
am: 16a7401d -s ours
Change-Id: Ieab655973b4d9be749750fee8a173c9d2b59d932