[automerger skipped] Fix flake unit test am: 03cf828e am: 707fd2d8 am:...

[automerger skipped] Fix flake unit test am: 03cf828e am: 707fd2d8 am: ec24e20b -s ours am: a6b7ee87 -s ours

am skip reason: skip tag Change-Id I908ebd76b36aaedd177384dd718c1b8477a28faf with SHA-1 a52c87f5 is already in history

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

Change-Id: I1d38f5eb643cd287a0f9009c7699da2043157a48