[automerger skipped] Merge "Replace PlaybackActivityMonitor with AudioDeviceCallback" am: 3424cdb269 am: f2799acb5d am: f4a8a48238 -s ours am: 5a785f9a18 -s ours

am skip reason: Merged-In Ieab2b408af537b477030ba75f8ae2b69ea8e4528 with SHA-1 e30838778e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2504276

Change-Id: Ifde9c3852e5ed262c61f055daf8606dd02768abd
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 43cbe1a2cfafcb6e770c3de0d357bdb98d651ee3
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS