Merge "Add CQI and table index to LTE and NR CellSignalStrength" am: 8dd47fcfc5 am: bbeb5eb6f6

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

Change-Id: I90963cbccf1a9b3cb75d56848f6e86f317ad8324