Merge "VolumeShaper: Update Direct/Offload to use media time" am: c6ba202225 am: 5f337c231a

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

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