Merge "Make testServiceForegroundDuration test more stable" into oreo-mr1-cts-dev
am: 4c91beefcc

Change-Id: I85e5fbe4b96170158c337ce2a528653932666c3b