Merge "VolumeCurve file build fail" am: e5b8810c56 am: 52a3541ad7

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

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