Merge "hotword: Fix inconsistent @NonNull and API comment" into sc-dev