Merge "Set more aconfig_declarations containers to system in frameworks/base" into main