Merge "set targetSDK level to 31" into sc-dev