Rename aconfig declarations to a common name.

Bug: 296507968
Test: Manual
Change-Id: I5e5ecb64d593939addcf356cb619c0944326af24
2 files changed