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

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

Change-Id: I33a55542cb9480975eac37e80bf2e9131b60d186