tree 61a6b105ad082b0816e25a1503d4a77d39457de1
parent d2eb366490c9cff74d39c20eda484c05d2065dd1
parent 221e35e17aa001d8a57335e65531c556d73c4062
author Xin Li <delphij@google.com> 1623655583 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623655583 +0000

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

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

Change-Id: I42e700d337869c55e5bd79f0b7e00b6641f0f302