Redefine query columns in provider

Bug: 135956699
Test: manual and atest CellBroadcastServiceTests
Change-Id: I5d3d99d4c85086c246490abc00a82d267a43cf1e
6 files changed