Revert "Change Flag Name Constants to Local Fields"

This reverts commit c140646f55b752cb79f08411c680ce9e8f57d836.

Reason for revert: b/314319629
Bug: b/314319629
Test: Pre-submit

Change-Id: Ib318c06eb66eaa2bb309a0cf02e1286faad40910
7 files changed