Merge "Fix issue #65055576: VoiceInteractionManagerService sets..." into oc-mr1-dev