DO NOT MERGE - Merge ab/7272582 am: 221e35e17a

Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797

Change-Id: I42e700d337869c55e5bd79f0b7e00b6641f0f302