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

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

Change-Id: Ifbb336cec55d5f8122365ae5e3ab407a236f10e6