Remove redundant modifiers from the constants

Bug: 141335235
Test: build
Change-Id: If2a41e5e3f0cf6466c931b943defa02d7ad0dc8e
2 files changed