Merge "Move protected broadcasts to Telephony"
am: 9c1905b186

Change-Id: Ic069cd0ba7a49aa3bcef482a0b89492928d3e2ef