Merge "[aapt2] Fix the sorting in ResourceTable for flagged entries" into main