[automerger skipped] Merge "DO NOT MERGE: Fix time limit for testWifiScanTimestamp." into pie-cts-dev am: 012bc6e36f -s ours am: 55203ff786 -s ours am: e5caa44e42 am: 908e33925d -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1554016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c92b3322dc8e40ca5f093c6d3455be671859d92