Merge "Fix tee sink build" into main am: 8482b35a am: 47489b68

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



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