Merge "Query usage event for a longer time period and then trim the usage...

Merge "Query usage event for a longer time period and then trim the usage events outside the expected period to make sure the app usage calculation near the boundaries are correct."