[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
Change-Id: I95883946cfa5599d2d5ee5a02abe49ee96d0b111