[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b9238ecf am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b9238ecf am: bbc4b26b am: 429d9086 -s ours am: e95ea66f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4bf38c2fbdf65bfec005312111b8f0b98654b220