Add complex query support for alarm history

Change-Id: Ie41d9a0be73a525ae105262fb5859960bf9f9df6
Merge "Add complex query support for alarm history"