Merge "Revert^2 "Fix for a11yManagerService broadcastReceiver ANR"" into 24D1-dev