Merge "aconfig_storage: fix aconfig storage dir permissions" into main