Merge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f
am: 5d6da4eab0

* commit '5d6da4eab024c13afbfef5cfec0f9f2b19168318':
  NullPointerException when starting VoiceInteractionManagerService