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

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

Change-Id: I8c75c9c035e15368248b859fb6c8223eb4cd0724