Reland "Prevent local overrides and error for RO flags"

This reverts commit 46227cac41234c37002f98c7fea907ff5477d2ef.

Reason for revert: relanding without apex access

Test: m
Change-Id: I8483d13e4be5a8c11df949a458f37dcb4d04b324
2 files changed