[automerger skipped] Merge "VolumeShaper: Update Direct/Offload to use media...

[automerger skipped] Merge "VolumeShaper: Update Direct/Offload to use media time" am: c6ba2022 am: 5f337c23 am: dd058164 -s ours am: d0aeee76 -s ours am: d6a40279 -s ours

am skip reason: Merged-In I0d8d73e70ed52c760cd483ebdb62e0f10b7f642d with SHA-1 398ffa20 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2598915



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