Merge "VolumeCurve file build fail" am: e5b8810c56 am: 52a3541ad7 am: bab2192fc4 am: 276bee18ef

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

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