Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am: 1f477fb270

Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8