Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main