[automerger skipped] Fixing empty tuple capability always expired am: bdd89374 am: 20c1798a am: 8f885fb8 -s ours

am skip reason: Merged-In Id54a71b71d353f3d2fa5c3246ab534ad581fe245 with SHA-1 545d699a is already in history

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

Change-Id: I28b00f0c60720ddadd7a303a09e35a55ff2d0468