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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19f57c1fed3de143a68269f5b0631f7cd3f43bc5