Merge "Fix issue #37108191: CTS: ClipDataJobTest#testClipDataGrant failure" into oc-dev am: 12fac76a87
am: 3609755ba4

Change-Id: I0f367b19508534183beff80f61ddde78f5339084