[automerger skipped] Merge "DO NOT MERGE: Change simulateUserInteraction to correct behavior with large timeouts" into pie-cts-dev am: 7215734f9b -s ours am: 90ddb48bba -s ours
am skip reason: subject contains skip directive

Change-Id: Ib6e70801f50999349b5baf13d940dacfe07b74d7