Make dbstore1002 handle s4 analytics queries

Bug: 66068
Change-Id: I2172ab08022ddf014ddcbdd7a807668d955a548a