Merge "Remove unnecessary FlaggedApi annotation from Layout.getText()" into main