[automerger skipped] Merge "Query all of the components with ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" am: 42c4502bc8 am: 2070259efb
am: f7bdf628da  -s ours

Change-Id: I0c46da4915cc9f033f9bc6368202ec77ac3727ff