Make dbstore1002 handle s2 analytics queries

Bug: 66068
Change-Id: Ied4a91cb674c0b72a40c39402ed2ba0b4e1eac92