RESTRICT AUTOMERGE Read flag resource overrides.

We were only reading resource overrides on debug builds, not
release builds.

This issue is already addressed in the main branch.

Fixes: 210114714
Test: atest SystemUITests
Change-Id: I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2
(cherry picked from commit 923cd9e73ea4facb1e11a79db6865340fcc2a907)
Merged-In:I40eb02d73faa4c2476d2a4e136e08c6dcd7795a2
2 files changed