[automerger skipped] Merge "Fix queryCLIP's ClassCastException" am: 23a1fb6f...

[automerger skipped] Merge "Fix queryCLIP's ClassCastException" am: 23a1fb6f am: 9cdd52b3 am: 578c3a52 -s ours

am skip reason: skip tag Change-Id I6e78cbd6106fe98a439bceda1caaf7da21525b22 with SHA-1 c3854a11 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1667000

Change-Id: I7ddaf8ed8e123a1369f15a03431ff12660d947b6