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

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

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