Merge "Set container to system for aconfig_declarations in AconfigFlags.bp" into main