Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev