Merge "VolumeCurve file build fail" am: e5b8810c56

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

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