[automerger skipped] Merge "Keep bundle effects enabled for volume apply with...

[automerger skipped] Merge "Keep bundle effects enabled for volume apply with unsupported devices" into main am: abe00d6a am: f4ef850b -s ours

am skip reason: Merged-In Ifd40db1ea11b29c1d1a8841ce3f6d7e8813d41d4 with SHA-1 b7e3ad7f is already in history

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



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