Merge "Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev am: 8305a1fb am: c98b0520"