[automerger skipped] Merge changes from topic "signalstrength_ctr" am: 4d8ff9fca7 am: 32c817a654 am: 8e619d81c1 am: 8024ac22fe -s ours

am skip reason: Change-Id I5eb389d0540912718c60d98b99501826c9fbbcb7 with SHA-1 8027cb1ad6 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505251

Change-Id: I3b241e12097369621df0e22e74556abfb93a4d6e