Merge "Make CQI APIs public" am: 8c190b4659 am: 1cfb7f99f5 am: 5170952e5f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2c2d35e37448152aa07dd09551f029ff9ad1314