Merge "Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev am: 2556236f8e am: 9c869043e9"