Update codebase based on aosp/main

Ghost Userrequested to merge
mkorpershoek/15-realign-main into ti-android-15

Similar to:

Depends on:

Note that even with both patches, we still have a playback issue. That regression is tracked by: TIAU-506

Edited by Ghost User

Merge request reports