Merge "Fix for a11yManagerService broadcastReceiver ANR" into main