Merge "Don't auto-create AppUsageHistory in getBucetExpiryTimeMs()." into tm-dev