[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: ad865c69b7

Change-Id: Ie69c75db6e6f8713b88eaaaf5dcb2a9a1ad53132