Merge "Revert "Replace remaining enforceXXX methods""

This commit is contained in:
Alex Johnston
2020-10-05 11:11:11 +00:00
committed by Android (Google) Code Review