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

Change-Id: I7fdbc7f911bcd1d82e1a8268ecd50a6662260a60