Make dbstore1002 handle s6 analytics queries

Bug: 66068
Change-Id: I5cd02fcb7d3bbbabf3cc02bea645988372bfd649