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

Change-Id: I61aba1578d6a24c3fcb67d88d43ae4d8334908ac