Merge "Keep bundle effects enabled for volume apply with unsupported devices" into main am: abe00d6ac1

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

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