Merge "Revert "Enable Doclava API check for changing the synchronized modifier""