tree defbc26dd3eaafd6175dc96a0172710b0dd00fee
parent 020e045ae6846f93e685818c621446e4b1779a11
parent 45d62e6f352104b8673d7b32b4dfc88337026f6d
author Sarah Chin <sarahchin@google.com> 1608194982 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608194982 +0000

[automerger skipped] Make action provision protected broadcast am: 87710d5e95 -s ours am: 45d62e6f35 -s ours

am skip reason: Change-Id I24c19d1bdd4677c4f1e513bc29b3a2d8d8ab9650 with SHA-1 5268563add is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/13129959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d7910ca2139b1eb3568fbc8862728ecad9469bc