Merge "Avoid false alarms from git secrets in hiddenapi flags csv files." into sc-dev