[automerger skipped] Merge changes from topic "audiomanagertest_cts_dnd" am:...

[automerger skipped] Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558 am: 73ea991b am: dca76273 -s ours am: d54665db -s ours

am skip reason: skip tag Change-Id I1f124deafd50d257683667ef986b88df1e4b8a75 with SHA-1 a52a4821 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623839

Change-Id: I70a7bd6b5498b4720dbdd697db4f57f17e080660