Merge "walleye/taimen: fix AVC level support am: fa9f654f am: 93cae4cf" into rvc-d1-dev-plus-aosp
mentioned in commit 4bf44e95
mentioned in commit 2e8fa93d