tree 09524741935ad1ca3405a7a7ec20a79a3ebf5197
parent f7e1966d08c84a9c4fa8adcf04fd0432304bb1a5
parent 8172f45111d3d29d4d0ab22a0f29f8e2c17a9740
author Jordan Liu <jminjie@google.com> 1570656372 -0700
committer android-build-merger <android-build-merger@google.com> 1570656372 -0700

Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a