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

Change-Id: I8c97bc1d29dcff6c2a4cafe0ff649d725b1f2266