[automerger skipped] Merge "DO NOT MERGE Change TIME_SPENT_IN_FOREGROUND for BatteryStatsValidationTest" into oreo-mr1-cts-dev
am: d9a17bef95 -s ours
am skip reason: subject contains skip directive

Change-Id: I4cdf7a64e6c6d11d04de68433ffe23021d544040