Merge "aconfigd: Update flag query to return more information" into main