[automerger skipped] Merge "[DO NOT MERGE] Let voicemail broadcast test pass if it is not applicable." into oreo-mr1-cts-dev
am: ea5c4fd713  -s ours

Change-Id: I3cc0e5376cda122dd56abf1362af1f10829cfa67