Build fixes for the flag enabled builds.

There have been some changes that were not amended to the right commit
and the current trunk build is failing due to missing changes.

Bug: 393639172
Test: Build with the flag enabled
Flag: com.android.graphics.libgui.flags.wb_media_migration
Change-Id: I60217227438a13c36ae9944c9941a94835308849