Merge changes from topic "audiomanagertest_cts_dnd" am: abffe558e3

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

Change-Id: If541a02594455f78d30a4126396c4aa84fa24b6e