Merge "Add CQI and CQI Table Index to Hal 1.6" am: a0e7918d8a am: e9fa46f49f am: a0bb74915c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1489837

Change-Id: I5f420a7f7042be87eb3669575e57429d282da21d