Merge "Shortcut and return caps of contacts who have non-expired cap info" am:...

Merge "Shortcut and return caps of contacts who have non-expired cap info" am: 7a362429 am: ae616d71

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

Change-Id: Ic14a30fdde310f5a1a8490d9f34a5513279e03d7