Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3 am: 73ea991b80

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

Change-Id: Iee503efcee7f950891876b5b7b4391c1bb8c2fbe