Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev