tree afdba7ef17a6a27394dc1917664cdcdcf34dde42
parent f59ffabf7d0f0b058a44408ed6cffb51ed2cb680
parent 735330dbb7fababad4b4dee2315bdaad5ea1bfcf
author Brad Ebinger <breadley@google.com> 1528400828 -0700
committer android-build-merger <android-build-merger@google.com> 1528400828 -0700

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

Change-Id: I7fdbc7f911bcd1d82e1a8268ecd50a6662260a60