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

Change-Id: Ib88378916ae9ffbe41253ac0e6dc5e9c8229e700