[automerger skipped] Merge "Fix AudioMix.equals()" am: e86d8d8b am:...

[automerger skipped] Merge "Fix AudioMix.equals()" am: e86d8d8b am: 6418fd3f am: da149f73 -s ours am: daaf5d28 -s ours

am skip reason: Merged-In I12d8cb24207c64b96d2fe65d4b2045873b080bc3 with SHA-1 fbf06672 is already in history

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



Change-Id: I9bfe4c782de4d17d2e53d9ad9a30be2d3eb9ab03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>