Merge "cts: Fix flaky testReportShortcutUsed test" into nougat-mr1-cts-dev am: 9bf12e5ad0 am: 8cb39c31fc am: 308cca9433
am: 0598eccc68

Change-Id: If51107b552c5d531d2cdf25aad56e07b157f1366