Make dbstore1002 handle s7 analytics queries

Bug: 66068
Change-Id: I9a61b6bad7c8573b642e8354ac37743f1c926b70