Merge "Merge "cts: Fix flaky testReportShortcutUsed test" into nougat-mr1-cts-dev am: 9bf12e5ad0"