[automerger skipped] Merge "Whitelist telephony broadcasts for bground use"...

[automerger skipped] Merge "Whitelist telephony broadcasts for bground use" am: 14906e7a am: 1d983739 -s ours am: ca489fde -s ours am: 1fafa6bb -s ours

am skip reason: Change-Id Id280fc2128b84dda2a8184dfa32ecc5b8f787afb with SHA-1 8acac15c is in history

Change-Id: I953fdf246fc6310c8db9778a9c97f634c498f084