[automerger skipped] Merge changes from topic "ViLTE-IMP" am: 557ec279 am:...

[automerger skipped] Merge changes from topic "ViLTE-IMP" am: 557ec279 am: ca0a9a91 am: af3d7d48 -s ours am: 12c7bc29 -s ours

am skip reason: Change-Id Ied6b1b7b8e2db93132025383151ab17d4966dadf with SHA-1 deebc7de is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/952487

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4920f23096913c9569893f7480373abfb2492d6