Merge "Update aconfig dump to sort by package name" into main