Merge changes from topic "signalstrength_ctr" am: 4d8ff9fca7

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

Change-Id: I9b53a6e29b296639b5af56662421e0f9fbf91d9b