Bug: b/284096062, b/279483360 Test: atest aconfig.test Change-Id: I4c96f35807de5cb2a745ba1c653513d9b22a5013