Merge "Make CQI APIs public" am: 8c190b4659

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib81275337cb465f5bcf0fd2dfd9ae3a9838069fd