[automerger skipped] Merge "VolumeShaper: Update Direct/Offload to use media time" am: c6ba202225 am: 5f337c231a am: dd058164c9 -s ours

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

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

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