[automerger skipped] Merge "Update signal strength on ServiceState in service"...

[automerger skipped] Merge "Update signal strength on ServiceState in service" am: 3169b21b am: 49286875 am: a86bc76e -s ours

am skip reason: Change-Id Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7 with SHA-1 62efb183 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: Ia11e13192dbef00b7071a9f4d9a3cd47caa5a58a