Merge "Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut""