Merge changes from topic "effect_proxy_align" into main am: 46f4d29b am: 15377ccb

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



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