Redefine query columns in provider

Bug: 135956699
Test: manual and atest CellBroadcastServiceTests

Merged-In: I5d3d99d4c85086c246490abc00a82d267a43cf1e
Change-Id: I5d3d99d4c85086c246490abc00a82d267a43cf1e
(cherry picked from commit b51f693e7bbcb6fb6487be1b2170d3275ad7d0a0)
6 files changed