Merge "[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" into pie-cts-dev