Merge "Guarding the ACCESS_SMARTSPACE permission with @FlaggedApi tag" into main