tree ba48dffbb410f129ef7ba17dae141947207ee3bf
parent d8d235dd290d515c8693243188826265644d02a2
parent 1285ab52ceae1b2596287924978a795e08896bc1
author Calvin Pan <calvinpan@google.com> 1612490001 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612490001 +0000

Merge "Add a carrier config for non-RCS capabilities expiration" am: 454e15dc12 am: 1285ab52ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I117abe342c7928f287c7a5f3f947b32e5da6678e