Merge "Merge "cts: Fix flaky testReportShortcutUsed test" into nyc-mr2-dev am: 789d052cca am: cabd2f605b" into oc-dev-plus-aosp