Merge changes from topic "signalstrength_ctr" am: 4d8ff9fca7 am: 32c817a654

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

Change-Id: I904408f82cba6b95fb01a6dd87572a63129d981e