Merge "Return empty map when queryUsageStatsForUser returns null in UsageStatsQueryHelper#queryAppUsageStats." into rvc-dev am: 005ce7cae6

Change-Id: Ia667a0496297e5fc750a470694c4a4e1b0525219