[automerger skipped] Merge "Shortcut and return caps of contacts who have...

[automerger skipped] Merge "Shortcut and return caps of contacts who have non-expired cap info" am: 7a362429 am: ae616d71 am: 4ede43fc -s ours

am skip reason: Merged-In Id7f07cbf3107271c7b2e9b9396d2c795974f3311 with SHA-1 82d096e4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1982946

Change-Id: Ic8c802836a617de8a89763c11986406253a8e934