Merge "APV: Update CSD according to the latest spec change" into main am: ac5f4935 am: f6c243a7

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



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